From af07937de3a4990b2b82acab3f7df2457dada941 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Mon, 24 Jan 2022 14:23:10 +0100
Subject: [PATCH] Use qmake patch from upstream

---
 ...-Support-Hurd-in-qmake.patch => 831.patch} | 39 ++++++++++++-------
 debian/patches/series                         |  2 +-
 2 files changed, 26 insertions(+), 15 deletions(-)
 rename debian/patches/{0009-Support-Hurd-in-qmake.patch => 831.patch} (61%)

diff --git a/debian/patches/0009-Support-Hurd-in-qmake.patch b/debian/patches/831.patch
similarity index 61%
rename from debian/patches/0009-Support-Hurd-in-qmake.patch
rename to debian/patches/831.patch
index b987ca428..1ec990f57 100644
--- a/debian/patches/0009-Support-Hurd-in-qmake.patch
+++ b/debian/patches/831.patch
@@ -1,14 +1,15 @@
-From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
-Date: Mon, 24 Jan 2022 12:00:17 +0100
-Subject: Support Hurd in qmake
+From 60e66d61b2cb9d238f0f6b1088ad7b78f4bc538b Mon Sep 17 00:00:00 2001
+From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
+Date: Mon, 24 Jan 2022 07:09:25 -0700
+Subject: [PATCH] simpify unix world conditionals in qmake files.
 
 ---
- GPSBabel.pro | 4 ++--
- libusb.pri   | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ GPSBabel.pro |  4 ++--
+ libusb.pri   | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/GPSBabel.pro b/GPSBabel.pro
-index 98b25c7..2bd178e 100644
+index 98b25c7d2..0ee8522d8 100644
 --- a/GPSBabel.pro
 +++ b/GPSBabel.pro
 @@ -281,7 +281,7 @@ HEADERS += $$FILTER_HEADERS
@@ -16,7 +17,7 @@ index 98b25c7..2bd178e 100644
  CONFIG(release, debug|release): DEFINES *= NDEBUG
  
 -macx|linux|openbsd {
-+macx|linux|openbsd|hurd {
++unix {
    if (equals(MAKEFILE_GENERATOR, XCODE)) {
      # "Configure tests are not supported with the XCODE Makefile generator"
      # assume we have the following headers
@@ -25,21 +26,22 @@ index 98b25c7..2bd178e 100644
  
  # build the compilation data base used by clang tools including clang-tidy.
 -macx|linux|openbsd{
-+macx|linux|openbsd|hurd {
++unix {
    compile_command_database.target = compile_commands.json
    compile_command_database.commands = $(MAKE) clean; bear $(MAKE)
    QMAKE_EXTRA_TARGETS += compile_command_database
 diff --git a/libusb.pri b/libusb.pri
-index a6604f9..c66a71e 100644
+index a6604f94b..9d589001f 100644
 --- a/libusb.pri
 +++ b/libusb.pri
 @@ -1,7 +1,7 @@
 -macx|linux|openbsd {
-+macx|linux|openbsd|hurd {
++unix {
    !defined(WITH_LIBUSB, var) {
-     macx: WITH_LIBUSB = included
+-    macx: WITH_LIBUSB = included
 -    linux|openbsd: WITH_LIBUSB = system
-+    linux|openbsd|hurd: WITH_LIBUSB = system
++    mac: WITH_LIBUSB = included
++    !mac: WITH_LIBUSB = system
    }
    equals(WITH_LIBUSB, no) {
      message("libusb-1.0 disabled")
@@ -48,7 +50,16 @@ index a6604f9..c66a71e 100644
        DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb.h>)
      } else {
 -      linux|openbsd {
-+      linux|openbsd|hurd {
++      !mac {
          equals(WITH_LIBUSB, system) {
            LIBS += "-lusb-1.0"
            DEFINES += LIBUSB_H_INCLUDE=$$shell_quote(<libusb-1.0/libusb.h>)
+@@ -27,7 +27,7 @@ macx|linux|openbsd {
+         }
+       }
+ 
+-      macx {
++      mac {
+         equals(WITH_LIBUSB, included) {
+           # TODO: It would be better to create an archive and link to it
+           #       to separate library build requirements from gpsbabel requirements.
diff --git a/debian/patches/series b/debian/patches/series
index 6759ed15f..49b3f2c60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,4 @@ gmapbase.html-location
 Disable-donation-nagging
 0007-Add-workaround-for-failing-test-on-i386.patch
 0008-Add-Debian-build-flags.patch
-0009-Support-Hurd-in-qmake.patch
+831.patch
-- 
2.30.2